cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,549 Commits 7 Branches 0 Tags
9fdd34b1ba5637fa7a0b2bc31314ce3e9218cae3
Commit Graph

3431 Commits

Author SHA1 Message Date
Zuhayr
8850a43dcb Fixes #3847 2014-01-30 23:21:00 +10:30
Zuhayr
b38e1a71be Fixes #4223 2014-01-30 22:06:57 +10:30
Zuhayr
bc48240fff Generalized yank_out_object(). 2014-01-30 21:56:33 +10:30
DJSnapshot
e76838bd6e fix for muting deadme as well. 2014-01-20 22:42:56 -08:00
DJSnapshot
64e3c3d6b9 Admin requested addition of a global dsay toggle. 2014-01-20 18:27:12 -08:00
Ccomp5950
78c032b317 AntagHUD restrictions, disallow players becoming mice. 
If antagHUD respawn restrictions are enabled, players will no longer be able
to use the "become mouse" verb if they have enabled their antagHUD's.

Observers were able to use antagHUD then become mice and die resetting their "has_used_antagHUD" variable allowing them to respawn bypassing the restrictions by becoming a mouse as well as respawning later.
 2014-01-15 03:25:13 -06:00
Mloc
57a83eae70 Fix for #4194 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-01-13 14:27:44 +00:00
Mloc
e25c60f930 Fix for #4289 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-01-12 23:23:04 +00:00
Ccomp5950
bc6561b9e4 Runtime fix for people that jump back in their body before hitting respawn or just stay in their body for 30 minutes. 
Who does that?  People that cause runtimes, that's who!

(Jerks)
 2014-01-10 15:59:40 -06:00
DJSnapshot
e524d2112f Merge pull request #4244 from LightningIron/master 
Ninja bugfixes/minor code cleaning/energy cost changes
 2014-01-10 13:42:42 -08:00
RKF45
c47be94b42 Removes braindeath as IC term 2014-01-09 21:49:21 +01:00
LightningIron
8c26c23157 Merge remote-tracking branch 'upstream/master' 2014-01-09 11:15:26 -06:00
Zuhayr
70fe0e02cd Merge pull request #4245 from SkyMarshal/airfixes 
Lots of bugfixes.
 2014-01-09 02:47:20 -08:00
SkyMarshal
f79ffa598e Tradeband and Gutterspeak now have a different font than Tradeband. 
Fixes #4143
 2014-01-08 22:15:47 -07:00
LightningIron
8ae2266526 Added captured variable to mobs, non-chair equivalent to being buckled into a chair 2014-01-08 20:49:45 -06:00
Zuhayr
a039f05372 Merge pull request #4224 from Ccomp5950/bug_fixes 
Bug fixes
 2014-01-07 02:36:51 -08:00
Ccomp5950
cd4ef7a1b7 Ghost chat unicode support...removed unneeded sanitize() 2014-01-05 19:30:52 -06:00
Fira
354b1978ea Partial fix for pAI emotes (they still can't hear beyond one container 
level, will require a say/emote code hack)
 2014-01-04 15:22:17 +01:00
Zuhayr
f679776a22 Made diona nymph evolution whitelisted. 2014-01-03 09:37:13 +10:30
Zuhayr
183afc61bf Reverts corgi dress-up due to being terrible and duplicating items. 2013-12-27 11:06:20 +10:30
Zuhayr
661593718f Using dev-freeze map. 2013-12-27 10:42:13 +10:30
Chinsky
0c94d2892d Fixes #4071 
Emote needed "me" action first, using custom_emote instead.
 2013-12-25 14:44:50 +04:00
Chinsky
5071ea57ad Fix for #3583 
Hostile mobs now check adjacency before applying damage.
 2013-12-25 14:20:56 +04:00
Zuhayr
b9fcd34df3 Merged config and changelog. 2013-12-22 23:11:29 +10:30
RavingManiac
b26492e66d Simplified the monkey pulling check as per Giacom's suggestion. 2013-12-21 13:51:06 +08:00
RavingManiac
e92bb6a02b Two config variables added - disable_player_mice and uneducated_mice. The first, if enabled, prevents players from spawning as mice, and the second, if enabled, prevents mice from understanding human speech (which they now do my default) 
universal_understand = 1 now allows player-controlled mobs to understand what everybody is saying without necessarily allowing them to talk back intelligibly. Mice have universal_understand = 1 by default.
 2013-12-18 16:56:49 +08:00
RavingManiac
751219dbfd Added "hide" verb to mousetraps, placing them on the same layer as hidden mice. 
Triggered mousetraps and dead mice will be moved back to the top layer.

Monkeys will no longer move randomly while being pulled.
 2013-12-18 02:08:38 +08:00
DJSnapshot
272d500e13 fix for accidentally deleted line. 2013-12-16 22:10:43 -08:00
DJSnapshot
c32df3852e Added checks so that space cleaner reagent and borgs can clean floors now too! 2013-12-16 22:07:54 -08:00
Mloc-Argent
b175c6906b Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	html/changelog.html
 2013-12-13 19:13:43 +00:00
Ccomp5950
0850c30d37 Become Mouse now has a confirmation window. 
Squeek!  Now people can quit complaining about hitting it by accident.
 2013-12-05 20:29:38 -06:00
Zuhayr
edabf18323 Merge pull request #4012 from N3X15/dna2 
DNA2 - A recode of DNA
 2013-12-05 02:39:55 -08:00
Zuhayr
5c1415f3b8 Removed some commented ability code. 2013-12-04 12:30:37 +10:30
Zuhayr
5e3857ff38 Compile fix for global ability list. 2013-12-03 03:36:10 +10:30
Rob Nelson
53c2aff420 DNA2 - A recode of DNA 
DNA now stores blocks internally as numbers and only makes the uni_identity and struc_enzymes strings when something has changed. This is vastly more efficient.

In addition, the API for using it has been simplified. Common tasks, such as setting a sub-block, or getting a value from the block, are handled entirely by the DNA datum with simple, easy-to-use procs.

Tested on local server, but may need balancing and additional look-over since the code is from our server (/vg/) and I likely broke or forgot something.
 2013-12-01 00:04:27 -08:00
Zuhayr
e90fd95a22 Merge resolution. 2013-12-01 15:19:29 +10:30
Zuhayr
4ea738c8b5 Merge pull request #3996 from comma/dev 
Fixed issue with chopped off heads not having hair icons.
 2013-11-30 20:46:04 -08:00
Zuhayr
19c41e3d75 Commenting out test ability stuff. 2013-12-01 15:12:11 +10:30
Ccomp5950
0040a91b23 Ghost MedicHUD now actually checks for viruses. 
Thanks Chinsky for the tip!
 2013-11-30 01:56:13 -06:00
Ccomp5950
d039bea124 Ghostbuff, round 2. MedicalHUD 
Ghosts can now toggle a medical HUD
 2013-11-30 00:00:56 -06:00
Chinsky
5b168c8e4b Merge branch 'dev-freeze' into dev 
Conflicts:
	icons/obj/ammo.dmi
 2013-11-30 05:15:22 +04:00
Zuhayr
367cc3a827 Added skeleton code for mob abilities. 2013-11-30 00:02:05 +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-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
Mloc
503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2013-11-24 23:37:09 +00: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
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