cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,918 Commits 9 Branches 0 Tags
014729a001b51af3a665684fbe68a3c3e3489ef1
Commit Graph

16446 Commits

Author SHA1 Message Date
Zuhayr
dfca49c900 Fixes #7105 2014-12-08 05:14:04 +10:30
Zuhayr
1211360118 Fixes #6974 2014-12-08 05:00:54 +10:30
Zuhayr
17a8c59ff9 Fixes #7151 2014-12-08 04:37:07 +10:30
Zuhayr
7ff46d64fb Fixes #7162. Eject ID verb for laptops is still busted though. 2014-12-08 04:22:56 +10:30
GinjaNinja32
e473e3d2ba Fix compile error due to depending on #7267 2014-12-07 17:23:30 +00:00
Zuhayr
a7d526f8b1 Fixes #7119 2014-12-08 03:51:21 +10:30
Zuhayr
74db269c40 Fixes #7266 2014-12-08 03:51:01 +10:30
GinjaNinja32
9e2cf5266c Allow forcesay with no client, add language toggles to player panel 2014-12-07 17:08:36 +00:00
GinjaNinja32
b6de85ec56 Fixes, better handling of things 2014-12-07 17:01:19 +00:00
Zuhayr
1176510fb2 Amendments to previous commit. 2014-12-08 03:29:03 +10:30
GinjaNinja32
17597af7fc Better handling of language list, mobs no longer require noise-language in their list 2014-12-07 12:09:29 +00:00
GinjaNinja32
6a975a1e6a Noise emotes 
Conflicts:
	code/modules/mob/living/carbon/brain/say.dm
 2014-12-07 12:09:02 +00:00
Zuhayr
b30be0a352 Fixes #7199 2014-12-07 22:13:31 +10:30
Zuhayr
be562e675c Actually fixes scanners. 2014-12-07 21:29:30 +10:30
Zuhayr
0fe2159f86 Fixes #7092 2014-12-07 21:21:00 +10:30
Zuhayr
35f5bb16c9 Fixes #7188 2014-12-07 21:20:47 +10:30
Zuhayr
e4a332c5b6 Fixes #7262 2014-12-07 21:20:24 +10:30
Zuhayr
a7ce13f49d Fixes #7223 and #6966, adds inhand and suit sprites for nymphs. 2014-12-07 20:44:11 +10:30
Zuhayr
117dd18284 Adjusted ninja spawn proc to check rig internals. 2014-12-07 20:13:59 +10:30
Zuhayr
3715dd6817 Shuffling some items around to ensure spawn 2014-12-07 20:01:43 +10:30
Zuhayr
54ba518762 Fixes #7253 2014-12-07 18:51:20 +10:30
Zuhayr
958eb62ed5 Refactors a lot of reused/redundant death code, fixes #7224 2014-12-07 17:18:56 +10:30
mwerezak
3002de4b50 Fixes atoms with no flags being walkable 
Fixes atoms that have no flags set allowing movement into them
regardless of CanPass().
 2014-12-07 00:59:07 -05:00
Atlantiscze
bf213e6889 Resolves compilation errors caused by previous merge 2014-12-07 04:43:00 +01:00
Atlantiscze
3815ac146f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into pewPEWPEWboom 
Attempt to resolve merge conflict.
 2014-12-07 04:33:46 +01:00
Zuhayr
2b525372f1 Fixes #7238 2014-12-07 11:52:29 +10:30
Zuhayr
2d7ea3028f Merge pull request #7257 from Baystation12/master 
Updating dev from master.
 2014-12-07 11:28:29 +10:30
Zuhayr
1dc68e22bc Merge pull request #7258 from Baystation12/master 
Updating dev-freeze from master.
 2014-12-07 11:28:27 +10:30
mwerezak
4582b2892a HTML formatting 
Also removes redundant holotable grab handling.
 2014-12-06 18:20:40 -05:00
mwerezak
550e5f63ea Makes forced launch handled by shuttle/process() 
Forced launches are now run by the shuttle controller through process()
instead of in a separate 'thread' launched from the ui.
 2014-12-06 18:07:21 -05:00
Segrain
8df3e41788 Fix for #7204. 2014-12-06 18:08:12 +03:00
Segrain
bb4f81e443 Fix for #7232. 2014-12-06 18:01:31 +03:00
PsiOmegaDelta
5aa90044d4 Merge pull request #7249 from mwerezak/atmos-tower 
Atmos tower, Nuke prison, talismans, engine
 2014-12-06 10:25:24 +01:00
Loganbacca
b3e0cc98cd Implantcase cleanup 
- Removed unnecessary icon definitions
- Cleaned up name formatting
- Removed colons
- Added variants for existing implants
 2014-12-06 16:20:16 +13:00
Loganbacca
ad6828e70a Update implantcase.dm to absolute paths 2014-12-06 16:17:07 +13:00
mwerezak
51bbd6e0da Merge remote-tracking branch 'upstream/dev' into holospace 2014-12-05 21:29:50 -05:00
mwerezak
44f2891966 Emagged holodeck consoles stay that way. 
Separates emagged state and holodeck safety state, prevents silicons from re-enabling safeties if someone has emagged the console.
 2014-12-05 21:28:29 -05:00
GinjaNinja32
95c2b09c94 Fix num2hex()'s handling of zero 2014-12-06 02:20:11 +00:00
mwerezak
f752ce2a49 Adds image for cult talismans 
So they aren't blank when examined.
 2014-12-05 20:56:07 -05:00
Zuhayr
ba1f4a8f03 Merge pull request #7248 from Baystation12/master 
Master into dev.
 2014-12-06 12:18:13 +10:30
Chinsky
60fcda13e7 Merge pull request #7241 from GinjaNinja32/slimefix 
Fixes invisible slimes.
 2014-12-06 04:23:43 +03:00
Chinsky
91cbd95838 Merge pull request #7237 from PsiOmegaDelta/PunchTheKeysForGodsSake 
Fixes #7233.
 2014-12-06 04:23:31 +03:00
Chinsky
92a88b8a23 Merge pull request #7243 from mwerezak/h2h 
Unarmed attacks
 2014-12-06 04:23:23 +03:00
mwerezak
032308fb9d Fixes #7213 restoring unarmed damage to previous values, adjusts unarmed attack logs. 
Unarmed attack messages no longer assume every attack verb ends with -ed.
 2014-12-05 18:10:39 -05:00
GinjaNinja32
e8eb73a3c4 Fixes invisible slimes 2014-12-05 20:50:33 +00:00
PsiOmega
d400f9d174 Encrpytion! 
This misspelling was about to drive me insane.
 2014-12-05 20:27:28 +01:00
GinjaNinja32
a4f1c617b8 Allow typing all arguments to adminhelp 2014-12-05 17:06:16 +00:00
Zuhayr
93805d5742 Merge pull request #7225 from PsiOmegaDelta/SyndiBorg 
Syndicate borg code refactoring.
 2014-12-05 23:37:31 +10:30
PsiOmegaDelta
422ff9b39e Merge pull request #7236 from mwerezak/ops-docking 
Remaps the nuke ops shuttle for station docking
 2014-12-05 13:57:31 +01:00
Zuhayr
d5c5418384 Merge pull request #7226 from Amunak/chat-shenanigans 
Minor changes for ghosts, added verb to remain anonymous
 2014-12-05 23:26:11 +10:30