cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 8 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

1602 Commits

Author SHA1 Message Date
Mloc-Argent
be153d14a3 Fixes for the tg cherrypicks. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-01-08 20:32:35 +00:00
Giacomand
363b8e82da Tweaked meteors to stop playing unnecessary sounds. 
Made meteors shake the screen more if you're closer and shake the screen of everybody on the station a little (big meteors only).
 2014-01-08 20:05:33 +00:00
Zuhayr
2c492d8289 Using DNA2 files from master. 2014-01-03 11:19:40 +10:30
Kilakk
7a75242640 Where the hell did this even come from? 
I should probably start checking for these things
 2014-01-01 13:46:21 -05:00
Kilakk
3f4646ed58 Fixed centcomm status reports listing vox raiders 
* It would say something like "Kikichata, the MODE"
* Which is hilarious, but still
 2014-01-01 13:28:52 -05:00
Zuhayr
9d4d14f107 Fix for low oxy tank at ninja spawn. 2013-12-31 11:37:21 +10:30
Zuhayr
4c371a3d0b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-12-31 10:25:54 +10:30
DJSnapshot
7a7eca4393 Merge pull request #4146 from Baystation12/dev-freeze 
Dev-freeze --> Master staging [Going live!]
 2013-12-30 13:52:21 -08:00
Kilakk
c7f840de73 Fixes #4145, nuke ops can choose their names on spawn-in 2013-12-30 15:38:02 -05:00
Zuhayr
5ca939fd39 Nuke starting condition rebalance, op number scaling rebalance. 2013-12-30 14:03:48 -05:00
Zuhayr
19c963ac73 Revised commit due to Mloc's suggestion. 2013-12-31 04:24:53 +10:30
Zuhayr
6888651da6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2013-12-28 23:14:43 +10:30
Zuhayr
c6c1a575d6 Merge of blood file, ammo icons, map. Manual binary file merge incoming. 2013-12-28 23:13:04 +10:30
Zuhayr
ba018c84af Typo. 2013-12-28 23:07:29 +10:30
Zuhayr
e9e5dd4ebe Map merge resolution. 2013-12-28 23:05:23 +10:30
Zuhayr
9f98909ce8 Nuke starting condition rebalance, op number scaling rebalance. 2013-12-28 23:00:42 +10:30
Mloc
1967a17715 Merge pull request #4126 from Zuhayr/dev-freeze 
Removal of corgi dressup, uncommenting of ninja block in Check Antags.
 2013-12-27 06:59:14 -08:00
Zuhayr
183afc61bf Reverts corgi dress-up due to being terrible and duplicating items. 2013-12-27 11:06:20 +10:30
DJSnapshot
4f4e9bb000 Fix for the nuke disarm menu not showing up. 2013-12-26 16:27:05 -08:00
Zuhayr
661593718f Using dev-freeze map. 2013-12-27 10:42:13 +10:30
DJSnapshot
efdeea5bab Nerf to shield blobs. 
Now they take 2 hits instead of 3, that way they are a little easier to deal with and hopefully not as much meta will have to occur.
 2013-12-26 13:20:38 -08:00
Ccomp5950
fb78caf9a5 Fixes Power Grid checks killing the AI's SMES. 
Added the turrent protected check to restore_power() that is already in power_failure()
 2013-12-22 08:38:26 -06:00
Zuhayr
ff52920fab DNA2 fixes cherrypicked from N3X15. 2013-12-23 00:06:56 +10:30
Zuhayr
d783fd5043 Manual binary merge of head icons. 2013-12-22 23:23:25 +10:30
Zuhayr
f8ebd9d5de Added checks for borers to various key-swapping powers to prevent weirdness. 2013-12-18 13:49:10 +10:30
Zuhayr
824b871902 Fixes the nuke suit spawn proc. 2013-12-15 14:50:24 +10:30
Zuhayr
92c4d6c66c Nook ops species-specific hardsuits on spawn. 2013-12-15 13:18:32 +10:30
jack-fractal
5255848719 adding modifications to cult mode, working spirits, and mask transformation procs 2013-12-08 14:12:40 -05:00
jack-fractal
5c87c3001a modifying visibility interface of ai to use generic visibility_interface 2013-12-07 16:34:24 -05:00
Zuhayr
edabf18323 Merge pull request #4012 from N3X15/dna2 
DNA2 - A recode of DNA
 2013-12-05 02:39:55 -08:00
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
Chinsky
5b168c8e4b Merge branch 'dev-freeze' into dev 
Conflicts:
	icons/obj/ammo.dmi
 2013-11-30 05:15:22 +04:00
DJSnapshot
8813123997 added config flags for objectives being enabled or disabled. 
added antag options menu.
added ability to choose where a syndicate uplink is installed.
 2013-11-29 17:02:23 -08: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
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
Zuhayr
b476a55b47 Fixes #3967 2013-11-23 20:52:39 +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
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
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
Zuhayr
ee6a69e35d Fixes #3248 2013-11-23 00:57:40 +10:30
Zuhayr
8400c73cc1 Nuke merge. 2013-11-23 00:44:19 +10:30
Zuhayr
bf44db3393 Due to total absence of ninja spawn points, using carpspawn directly. 2013-11-23 00:39:43 +10:30
Zuhayr
ddabdf90f2 Fixes #3842 2013-11-22 23:17:57 +10:30
Zuhayr
222a544d5d Raider state display compile fix. 2013-11-20 18:47:37 +10:30
Zuhayr
9015b815b3 Uncommented the original Heist objective code, removed one-of-each testing code. 2013-11-20 18:18:38 +10:30