cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-22 23:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,760 Commits 29 Branches 2 Tags
0ee6cde88e995d919e6b60c7de250ca3ef0bb729
Commit Graph

8233 Commits

Author SHA1 Message Date
Tayyyyyyy
0ee6cde88e Fix a few style issues 2018-05-25 18:39:38 -07:00
Tayyyyyyy
919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Tayyyyyyy
09fb007cfc Fix examine 2018-05-25 18:34:29 -07:00
Tayyyyyyy
98c6ddf5a7 Fix his, he, him 2018-05-25 18:34:28 -07:00
Tayyyyyyy
aa9d658847 Them 2018-05-25 18:34:28 -07:00
Tayyyyyyy
42f85919de More their 2018-05-25 18:34:26 -07:00
Tayyyyyyy
ad23362781 Death 2018-05-25 18:34:24 -07:00
Tayyyyyyy
bc210f595b Examine 2018-05-25 18:34:24 -07:00
Tayyyyyyy
e6ead787c4 Use get_visible_gender 2018-05-25 18:34:23 -07:00
Tayyyyyyy
c80704e724 Conjugating verbs is hard 2018-05-25 18:34:23 -07:00
Tayyyyyyy
170266d827 More pronouns 2018-05-25 18:34:23 -07:00
Tayyyyyyy
497072d4d1 Update pronoun usage 2018-05-25 18:34:22 -07:00
Fox McCloud
404c712aea Removes the last of the color macros 2018-05-23 14:05:17 -04:00
Fox McCloud
224b18af1c Merge remote-tracking branch 'upstream/master' into attack-animation-improvements 2018-05-17 23:34:01 -04:00
Crazy Lemon
7aa9731e52 Merge pull request #8898 from tigercat2000/face_lock 
Directional Locking
 2018-05-17 20:28:03 -07:00
tigercat2000
85a19c9935 Merge remote-tracking branch 'upstream/master' into face_lock 
# Conflicts:
#	code/modules/mob/mob.dm
 2018-05-17 20:21:39 -07:00
tigercat2000
1cfc3f27c8 Merge pull request #8974 from Fox-McCloud/holo-projector 
Ports Holoprojectors
 2018-05-17 20:19:13 -07:00
Fox McCloud
c0d5655f4d Further Improves Attack Animations 2018-05-17 19:48:03 -04:00
Fox McCloud
709f2b5ff6 Merge pull request #9004 from Anasari/BotLogging 
Naming bots is now logged
 2018-05-15 22:06:46 -04:00
Fox McCloud
4c1dc7dea7 Merge pull request #9017 from Tayyyyyyy/punpun 
Restore Pun Pun
 2018-05-15 17:59:57 -04:00
Tayyyyyyy
8a8f244d3f Remove unneeded args 2018-05-15 01:15:27 -07:00
Tayyyyyyy
fea1dada3a Restore Pun Pun 2018-05-14 22:31:05 -07:00
Crazy Lemon
63ec546a0a Merge pull request #9008 from Fox-McCloud/remove-mode 
Removes All Modes
 2018-05-14 17:49:58 -07:00
Fox McCloud
b3524505b5 tweak 2018-05-14 17:51:13 -04:00
Ansari
69cefb7f3c Actually fix usr to user and compile 2018-05-12 10:28:26 +08:00
Ansari
de818d92ab user instead of usr 2018-05-12 10:14:14 +08:00
Fox McCloud
f521f2765c Removes All Modes 2018-05-11 17:55:45 -04:00
Ansari
6084f5cfef Log bot 2018-05-10 16:32:34 +08:00
tigercat2000
254cdd6055 Merge pull request #8972 from Fox-McCloud/power-cell 
Power Cell Code Cleanup
 2018-05-09 11:26:03 -07:00
tigercat2000
aedece7207 Merge pull request #8989 from Kyep/nations_etc_borg_runtime 
Fixes #8271 - rare borg runtimes
 2018-05-09 11:22:04 -07:00
Fox McCloud
7d4fb45509 Merge pull request #8947 from tigercat2000/more_ss_ports 
SS Conversion: Atoms, Machines, n' Mobs
 2018-05-07 17:54:49 -04:00
Kyep
a6d06ea397 Fixes #8271 - rare borg runtimes 2018-05-06 22:21:35 -07:00
tigercat2000
c78075414c Merge pull request #8488 from Kyep/ds_tweaks 
Tweaks Deathsquad
 2018-05-04 19:03:54 -07:00
Fox McCloud
8845262d65 Merge remote-tracking branch 'upstream/master' into holo-projector 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	paradise.dme
 2018-05-04 16:37:24 -04:00
Fox McCloud
8bd042240f Power Cell Code Cleanup 2018-05-02 19:35:18 -04:00
tigercat2000
cacde22a27 Readd human/New warning about excessive arguments 2018-04-30 09:36:22 -07:00
tigercat2000
7fb8f8d76c Merge remote-tracking branch 'upstream/master' into more_ss_ports 
# Conflicts:
#	paradise.dme
 2018-04-30 09:27:11 -07:00
Fox McCloud
b394cf3624 Ports Holoprojectors 2018-04-30 00:24:46 -04:00
tigercat2000
3c1fbf9cc5 Merge pull request #8938 from Fox-McCloud/guillotine 
Ports Guillotine
 2018-04-29 20:28:50 -07:00
Fox McCloud
63e2a175fd Merge remote-tracking branch 'upstream/master' into timer-subsystem 2018-04-29 21:14:11 -04:00
Fox McCloud
f7181df136 Does Surgery on Surgery to Fix Surgery 2018-04-29 20:41:37 -04:00
Fox McCloud
278e6a7c25 the last of the TIMER_STOPPABLE 2018-04-29 01:12:57 -04:00
Fox McCloud
510c5b4268 fixes 2018-04-29 00:53:13 -04:00
tigercat2000
7d8c9a731a SS Conversion: Atoms, Machines, n' Mobs 
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
 2018-04-28 17:55:15 -07:00
Fox McCloud
cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04:00
tigercat2000
dabdbd4426 Merge pull request #8929 from Aurorablade/MagicalPlasma 
Tries to fix plasma wizards
 2018-04-27 17:06:49 -07:00
Fox McCloud
8f5f57dd0b adds clapping 2018-04-27 19:27:47 -04:00
tigercat2000
3d55fb6a83 Leaving viewers() will now break a lock 2018-04-27 13:48:56 -07:00
Aurorablade
21aa88ca59 missing thing 2018-04-26 18:55:55 -04:00
Fox McCloud
402f9d4c6b Merge pull request #8817 from uraniummeltdown/mob 
[READY] Mob Proc Cleanup
 2018-04-26 17:19:02 -04:00