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
15,136 Commits 9 Branches 0 Tags
d80edab61964da4306595cf385adb87c1de9c2e1
Commit Graph

11265 Commits

Author SHA1 Message Date
Zuhayr
d80edab619 Merge resolution. God damn the changelog. 2013-11-29 22:39:33 +10:30
Zuhayr
794ca4064e Merge resolution. 2013-11-29 22:36:36 +10:30
Zuhayr
9c4b4c2817 Merge resolution. 2013-11-29 22:34:09 +10:30
Mloc
f1672e2de0 Merge pull request #3987 from MrLeebo/dev 
Thanksgiving Update: Tofurkey!
 2013-11-29 03:10:10 -08:00
Chinsky
6b23a0d7c0 Merge pull request #3982 from Mloc/bs12-hooks 
Implements hooks, an easier way to write code to be called at startup/roundstart/roundend/etc.
 2013-11-28 05:32:08 -08:00
Jeremy Liberman
6afa23a62e Adds tofurkey and stuffing food items 2013-11-28 03:45:13 -06:00
Chinsky
845a995abe Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	icons/mob/uniform.dmi
 2013-11-27 04:12:42 +04:00
Chinsky
83d1924b83 Commiting SueTheCake's detective things. 
-New set of clothes spawning in the closet.
-Replacement of revolver by semiauto gun, with update to autolathe recipies.
 2013-11-27 04:10:06 +04:00
Zuhayr
0935d7d7a6 Merge pull request #3977 from Ccomp5950/loyaltyimplant_fix 
Runtime fix:  Loyalty Implants, Monkeys, and Traitor Panels!
 2013-11-25 13:48:09 -08:00
Zuhayr
aa6744344a Merge pull request #3976 from Ccomp5950/custom_items_buggaloo 
Custom Items.
 2013-11-25 13:47:43 -08:00
Mloc-Argent
5e34c0e056 Hmm hmm, it could help to actually commit the hooks.dm file, couldn't it? 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-11-25 21:19:58 +00:00
Mloc-Argent
6095a3a249 Merge branch 'dev' of github.com:Baystation12/Baystation12 into bs12-hooks 2013-11-25 21:17:07 +00:00
Mloc-Argent
33805e639b Implements hooks, an easier way to write code to be called at startup/roundstart/roundend. 
Current hooks are "startup", "roundstart", and "roundend".
Most stuff in world/New() has been moved over to the startup hook.
Roundstart and roundend have no hooks yet.

Removed the unused "newbanjob.dm" file and associated verbs/topics.
Bumped RECOMMENDED_VERSION up to 501.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-11-25 21:16:09 +00:00
Mloc
d8683f2d39 Revert "Merge pull request #3965 from jack-fractal/dev" 
This reverts commit fa57b76f25, reversing
changes made to 40ee2278ed.

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-11-25 11:59:57 +00:00
Zuhayr
8b5664f321 Merge pull request #3975 from Ccomp5950/lasertag_suicide 
Can no longer commit suicide with a lasertag gun.
 2013-11-25 03:19:05 -08:00
Zuhayr
fa57b76f25 Merge pull request #3965 from jack-fractal/dev 
Mask of Nar'Sie - 1.0
 2013-11-24 20:57:04 -08:00
DJSnapshot
950836c05b Merge pull request #3974 from Ccomp5950/demonblood_runtime 
Fixed a runtime issue with demonsblood.
 2013-11-24 16:21:37 -08:00
Ccomp5950
f7dd1b69aa Runtime fix: 
A traitor panel used on a player-monkey would runtime due to the loyalty implant fix.

We ignore loyalty implants in monkeys, monkeys don't even know what Nanotrasen is, the nanobots probably don't even know what to do with a monkey.
 2013-11-24 17:52:26 -06:00
Ccomp5950
cc5418b3cd Requested removal. 
Seth Sealis - Gray Coat
Ashley Rifler - Purple Glove

http://baystation12.net/forums/viewtopic.php?f=33&t=9097
 2013-11-24 16:57:18 -06:00
Ccomp5950
e8157e36f8 Custom Item Code: Sakura Hokkaido's Kimono (say that 3 times fast) 2013-11-24 16:51:30 -06:00
Ccomp5950
20b803b808 Custom Items Code: Yuri's Flask and Mai Yang's dres. 2013-11-24 16:28:48 -06:00
jack-fractal
39542c7760 - removing 'colon' use for proc calls. Generally a bad idea. 
- adding a check for being silenced to use runes
- adding extra slashes in front of the mask definition
- re-adding the autotransfer.dm file to the include list
 2013-11-24 16:13:28 -05:00
Mloc
a2fdf79da4 Merge pull request #3972 from Zuhayr/master 
Fixes #3642
 2013-11-24 12:54:06 -08:00
Ccomp5950
72b762db53 Can no longer commit suicide with a lasertag gun. 
And you will feel silly for even making the attempt.
 2013-11-23 21:51:15 -06:00
Ccomp5950
e684b69741 Fixed a runtime issue with demonsblood. Was causing runtimes because data was inheriting the bloods data var (which is a list). 
The drink will still maintain it's reagents and data vars but when ingested and procesed the blood is ignored.

Downsides, you can't get sick from ingesting blood in a drink (which..you shouldn't anywho)

Possible future updates:  since blood is an amnetic substance make the person have nausia for ingesting it if quantities are high
 2013-11-23 20:21:51 -06:00
Jeremy Liberman
7e22046b1e Add Cash Bag. Works like Plant Bag but for cash/coins 2013-11-23 17:22:01 -06:00
Jeremy Liberman
6bd00eb561 Emag ATMs to drop money 2013-11-23 16:59:30 -06:00
Zuhayr
185c83b287 Fixes #3642 2013-11-24 09:22:50 +10:30
Zuhayr
dc90ab9eb4 Merge pull request #3964 from Ccomp5950/atmostech_access 
Bugfix:  Atmospherics technicians will now have external_airlock access
 2013-11-23 14:47:50 -08:00
jack-fractal
ce18d47778 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.int
	code/controllers/verbs.dm
 2013-11-23 11:58:50 -05:00
Mloc
c5cd3562e3 Merge pull request #3961 from Ccomp5950/loyaltyimplant_fix 
Bugfix(2126) Traitors still have loyalty implants, admins should be able to remove/disable implants
 2013-11-23 04:02:40 -08:00
Zuhayr
471c45471e Fixes #3927 2013-11-23 21:08:52 +10:30
Zuhayr
b476a55b47 Fixes #3967 2013-11-23 20:52:39 +10:30
Zuhayr
bfc5a61da1 Fixes #3966 2013-11-23 20:33:58 +10:30
jack-fractal
4ed7c79fcc - making sure to add the viewpoint properly to roundstart cultists. 
- there are way too many ways to make someone a cultist...
 2013-11-23 02:20:19 -05:00
jack-fractal
4f44d0fd9b Removing world spam and viewport adding using the equipcultists proc. 2013-11-23 02:01:40 -05:00
Zuhayr
abd17deb5b Fixes #3962 2013-11-23 14:02:10 +10:30
Zuhayr
7cc1c93207 Clamps pill numbers between 1 and 20. 2013-11-23 13:47:20 +10:30
Zuhayr
6e2aa2e28a Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-11-23 13:21:24 +10:30
Zuhayr
f359919623 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-11-23 13:21:11 +10:30
Zuhayr
85661195bc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-11-23 13:20:15 +10:30
Zuhayr
740117fa2d Merge pull request #3954 from comma/bygex 
Bygex by Carnie
 2013-11-22 17:57:49 -08:00
Zuhayr
6f5fcb7ecc Merge pull request #3960 from zekesulastin/cloning-language-hack 
A more complete fix to #3697 - languages post-clone
 2013-11-22 17:31:45 -08:00
Zuhayr
8b1c54823b Merge pull request #3959 from Ccomp5950/blindfold_fix 
Bugfix(3937) Blindfolds cause permenent blindness
 2013-11-22 17:30:59 -08:00
jack-fractal
5df2797b86 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.int
 2013-11-22 20:30:23 -05:00
Zuhayr
6988eef365 Merge pull request #3957 from Ccomp5950/master 
Admin request:  Added admin logging to Detomatix cartridge explosions.
 2013-11-22 17:30:08 -08:00
Zuhayr
68fb25e21c Merge pull request #3958 from DJSnapshot/hotfix 
Fix for reported issue with the transfer_controller causing a runtime error
 2013-11-22 17:29:10 -08:00
jack-fractal
3eb8d1c2b9 - lots of debugging 
- modifying how runes are called to use reflection
- adding highlander code to make sure that there can only be one mask
- adding Spread Shadows spell
- adding cult admin investigation log
- adding mask icon
 2013-11-22 20:09:24 -05:00
Ccomp5950
5fb242afc8 Bugfix: Atmospherics technicians will now have external_airlock access 
We gave them suits, we never gave them access.

Cleared this already with Raven
 2013-11-22 19:00:18 -06:00
Ccomp5950
bcbf02e809 Changed admin message to use the proc that formats for easy Admin-PM of the baddie. 
Thanks Kilakk for pointing it out.
 2013-11-22 18:36:20 -06:00